fixed orientation detect (and tested), added annotation for R10