Fix + test for #90
Merge pull request #91 from baruchoxman/master

Fix + test for #90