Contrib/francxk

New feature branch with linearised history to clean #1