Fixes #10
Merge pull request #41 from korczis/devel

Fixes #10