Cleaning up
Merge pull request #1 from Dasonk/master

Cleaning up