removed time component in rotation
Merge remote-tracking branch 'origin/master'
fixed camera location determine logic