Merge pull request #4 from AxTo/master

Merge stuff
Experimental autoscroll fix
Forgot to add y = y + z
Merge pull request #5 from AxTo/testing

Test merge