Fix #39
Merge pull request #79 from jmaas/master

Fix #39