Merge pull request #3 from DrCake/master

Merge pull request #2 from DrCake/dev
Code cleanup
Merge pull request #4 from DrCake/dev

Dev