Closes #28
Fixed tests
Merge pull request #29 from arekkas/patch-2

Closes #28