Merge branch 'devel'
fix version on master
make version detection better