Merge pull request #91 from timotheecour/master

fixes bug/11671
fixed clean
Merge pull request #92 from timotheecour/dev

fixed clean