Major cleanup
Merge pull request #1 from cyrille-leclerc/master

Major Cleanup