Broken implementation due to system restrictions
Merge branch 'master' into camera
Fixed camera