Cleaning up and world
Merge pull request #24 from thePlasm/master

Cleaning up and world