Fixed #34
Merge pull request #35 from ainop/master

Fixed #34, but affected util methods