Patch for Issue #124: Default values would over-ride supplied values
Merge pull request #125 from cognitiveflux/issue_124_default_values

Patch for Issue #124: Default values would over-ride supplied values