user supplied options should overwrite defaults
Merge pull request #19 from srkirkland/master

user supplied options should overwrite defaults