Minor changes (cherry-pick from eab71f9)
Fixed #51. Added a `use-defaults` option when calling from_dict().
Addressed #52
Merged fixes for #51, #52 into master