fix version on master
make version detection better
Merge branch 'devel'
uhm, tags... :P
tags..
tags..