Merge pull request #293 from s0undt3ch/develop

Include cli options into loaded config dictionary.