Added map functions
Merge origin/master