Merge pull request #11 from PierreLvx/master

Some more cleanup.