Merge pull request #84 from snakevil/master

Fixed #33.