Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
bumped version number
Merge branch 'develop'
Merge branches 'develop' and 'master'
Merge branch 'develop'
several bug correction, refractoring
Merge branches 'master' and 'develop' into develop