Merge pull request #1 from ralph2140/master

merged
fixed camera
Merge pull request #3 from pjako/master

camera fix