bump version
Merge branch 'master' into devel
more on #125