Merge branch 'master' of github.com:slaweet/geography