Fixes #63
Merge pull request #64 from beljango/master

Fixes #63