Merge branch 'devel'
Release version 0.6.0
Merge branch 'master' into devel
Begin new dev version