Added a camera option

Also a couple minor optimizations
Merge pull request #816 from tambry/CameraAndOptimizations

Added a camera option