Merge pull request #1 from beckermr/master

fixed some bugs in config arg passing
Merge pull request #2 from esheldon/master

Merge pull request #1 from beckermr/master