Merge branch 'master' of github.com:individym/maparound.core