Initial commit
Merge https://github.com/punkoffice/mapTest