Merge branch 'devel'
v0.4