Merging the pull request #13 from adurieux with chiffa's staging

Preparing the post-refactoring merge