ready to merge
Merge pull request #2 from Elytroid/views

ready to merge