simplifying the transition
Merge branch 'master' of https://github.com/JeromeLefebvre/ChildFirst