Merge pull request #4 from zapiski/master

Views