Fix #127

a decision has to be taken over views...
Merge branch 'feature-fixv' into develop