Attempt at fixing orientation issue
Merge remote-tracking branch 'origin/master'
Flip orientation fix