Altered constructor, two more parameters. Fixed kwargs.iteritems. Added test case test_no_config1.