Fixed bug out of screen (i think)
Merge branch 'release/1.2'