Added additional ini-settings to the default ini
Fixed argument parsing a bit
Merge pull request #159 from jaytaph/arg_parsing

Arg parsing