Merge pull request #900 from timlinux/master

HOTFIXES from Marco for Volcano 0 aggregation and hard clipping option not being recognised.
Merge pull request #901 from timlinux/master

Fix failing tests in master caused by version bump