Smoother transition
Merge pull request #106 from wmathurin/unstable20

Smoother transition