Merge pull request #348 from anthraxx/master