Merge pull request #1 from waremon/master

add camera
fix views