cleaning up my messes
Merge remote-tracking branch 'origin/master'
fixed orientation issue
Merge remote-tracking branch 'origin/master'