Only set options from command-line if they were explicitely specified
Use 'value()' instead of 'operator[]()' to avoid accidental setting of keys
Merge pull request #101 from jbaiter/master

Only set options from command-line if they were explicitely specified