Fix/Cleanup
Merge pull request #333 from ninjalulz/master

Fix/Cleanup