Merge pull request #10 from Cyruxx/master

Merge pull request #9 from Cyruxx/develop
Fixes #7
Merge pull request #11 from Cyruxx/develop

Fix #7