prepared for release
increased version number in configure.ac
Merge branch 'develop'
Merge branch 'master' into develop