update to maps code
Merge branch 'Maps_Michael' into code