Add missing cilantro root option
Merge branch 'master' into demo