Merge pull request #191 from wmathurin/unstable

Cleaning up at the end