Merge pull request #10 from Kryolith/master

ghghg
Coordinate Fix
Merge pull request #11 from Kryolith/Sebastian

Sebastian