added support for configuration options
Merge pull request #17 from gregpabian/master

Added support for configuration options