[CLEAN] Code
Merge pull request #6 from Neozonz/develop

[CLEAN] Code