map related classes were added for 0.1.1
Merge remote-tracking branch 'origin/master'