still cleaning up
Merge pull request #705 from arnaudbey/master

still cleaning up