Complete map loader
Add default map file
Merge branch 'dev'