cleanup
Merge pull request #142 from obourgain/master

cleanup