Pickup options set in config
Merge pull request #6 from tlvince/options

Pickup options set in config