Fixed bugs with image rotation
Merge branch 'master' of https://github.com/bmtreuherz/IEEE2015