bugfix and new volumes
Merge branch 'develop'