Fixed #1
Merge pull request #2 from Happyr/fixes

Fixed #1