Merge pull request #4 from zapiski/master

Views
Merge pull request #16 from Osebek/master

Merge pull request #4 from zapiski/master