fixes #28
Merge pull request #32 from steffel/dev

fixes #28