Merge pull request #21 from biergaizi/master

Allow loading config from an alternative config file (and other small changes)
allow to -c to specify the location of the config file