tests and fixes #10
Merge branch 'hotfix/10'