Merge pull request #6 from random-walk/master

Merge View from master to dev