Merge pull request #9 from Cyruxx/develop

Merge pull request #8 from Cyruxx/master
Merge pull request #10 from Cyruxx/master

Merge pull request #9 from Cyruxx/develop