Merge pull request #4 from Josiastech/master

Clean all the mess ;)