WIP
Merge branch 'devel' into examples