Configuration options
Merge pull request #1 from vmotsak/master

Updating to have Configuration options