Fix view + add Tristan's code
Merge pull request #3 from afsanee/master

Fix view + add Tristan's code