Moved away from CloudMade - resolved issue #7