Refresh to ensure options preservered.
Working selector for mappings.
Merge pull request #13 from dtzinov/failures-01-20-14

Failures 01-20-14