Merge branch 'devel'
Bumped package version
Merge branch 'master' into devel