v0.1: Merge remote-tracking branch 'origin/master' into localCoordinates

This is now fully working - albeit not as fast or with enough documentation as I would like.