Merge pull request #240 from fabienrohrer/master

Fixed camera due to a bad commit