Merge pull request #6 from random-walk/master

Merge View from master to dev
Merge pull request #7 from random-walk/develop

Merge pull request #6 from random-walk/master