Merge pull request #106 from wmathurin/unstable20

Smoother transition
Merge pull request #107 from wmathurin/unstable20

More tests
Merge from upstream