Merge pull request #5 from thesii/develop

Develop to Master
Merge remote-tracking branch 'origin'
Removed some pointless stuff.