cleaning up
Merge pull request #2 from cmaumet/master

cleaning up