Merge with comen/map

Merge with comen/map on 11/21/2014