on going xD
Merge branch 'feature/view' into develop