Merge branch 'Kitten'
added map
Merge branch 'master' into Kitten