Merge branch 'devel' into release
v0.4