Review 140508 root argument

Merged master to cbosdonnat's PR