issue35 - add ability to use any coordinate system

Code isn't very clean at the moment. Will fix this soon..
(the same comment applies to both classes)