Merge pull request #15 from Suckzoo/master

From Master
code adjustment
Merge pull request #16 from Suckzoo/camera

Camera