Code Cleanup
Merge pull request #8 from Tuxle/development

Code Cleanup