Fixed movement, sortof
Merge pull request #15 from Loct/master

Fixed movement, approximately