fixing camera
merge master