Merge pull request #53 from ddsc/maps_extralayers

Maps extralayers
Merge branch 'master' into maps_extralayers