swapped x and y
Merge pull request #3 from jurgenvinju/master

swapped x and y