Merge pull request #8 from drpepper240/cameraFix

Camera fix
Merge pull request #32 from ZLOFENIX/master

Merge pull request #8 from drpepper240/cameraFix