Fixed default value mapping
Merge pull request #202 from dantleech/fixed_default_value_mapping

Fixed default value mapping