Fix
Merge pull request #27 from jmaas/master

Fix