Bugfix
Merge pull request #49 from jmaas/master

Bugfix