Offlinemaps

Just fixing some things in #144 to be able to do the merge.