'Simplify' tutorial ...
Merge branch 'devel'