Merge
Merge branch 'devel' into devel2
Fixing merge conflicts and compare search
Merge branch 'devel2' into devel
interactive examples