Fixes #109     Orientation fixes