Camera 

Pull request for the Camera. I will test this tomorrow but @jetatar can you check this is the right code you want to merge?