Fix #17
Merge pull request #18 from Cyruxx/develop

Fix #17