Merge pull request #65 from zimmski/fix-default-values

Fix map default values and IniIncludeDefaults