Merge pull request #1 from SaschaGalley/master

Merge from master
Moving configuration and options out to dedicated class
Fixing bug with valued options
Merge pull request #6 from jrcryer/master

Moving configuration and options out to dedicated class