Fixes for Issues 9 and 17

Fixes https://github.com/open-city/civic-json-worker/issues/9
Fixes https://github.com/open-city/civic-json-worker/issues/17