Fix #195
Merge branch 'feature-fixBV' into develop