fixed issue 12

Pending testing at different resolutions
Merge branch 'master' of https://github.com/AUTUpStageTeam/UpStage2013