Fix #56
Add test
Applied Maks3w feedback
Merge pull request #66 from snoob/issue-#56

Fix #56