Fixes #61
Merge pull request #62 from cyberplant/master

Fixes #61