Added restrictions to the edge of the screen for the movement
Merge branch 'issue22' into development