fixed orientation issue - for real this time, i swear
Merge remote-tracking branch 'origin/master'