misc changes
Camera
Merge pull request #5 from CecileP/master

Merge
Merge pull request #9 from srroger/master

Merge