Updated Camera functionality - 1007 - 00:12AM
Merge remote-tracking branch 'origin/master'