Fixed #4
Merge pull request #5 from frostbytten/develop

Fixed #4