Merge pull request #55 from fulldecent/master

Fixes #48