Hotfix: version number
Merge branch 'devel'