Merge branch 'devel'
Release 0.6.1
Correct compilation issue and release 0.6.1
Merge branch 'master' into devel
Begin dev version