[Issue #130] Fix
Merge branch 'feature-view' into develop