maps added and master branch merged