Anysysjgw/map — pull request #2 by Anysysjgw (2014-11-21 15:22:34+00:00)
Title: Merge with comen/map

Merge with comen/map on 11/21/2014