add option map, not flatMap
Merge pull request #194 from twitter/feature/option_map

add optionMap