refactoring
Merge branch 'feature/views' of github.com:vispro/visprosl into feature/views