Updated maps
Merge branch 'updatemaps'