Merge pull request #9 from Cyruxx/develop

Merge pull request #8 from Cyruxx/master