Revert "Revert "Merge branch 'master' of https://github.com/koenvb/medinaMaps""

This reverts commit 856f8d807469eda322ffe49f7198fd8f0693465b.