Merge pull request #5 from Cyruxx/master

Update
Merge pull request #6 from Cyruxx/develop

Merge pull request #5 from Cyruxx/master