Fixing defaults for that were incorrect
Merge pull request #227 from jdalphon/fixDefaults

Fixing defaults for that were incorrect