Merge pull request #81 from wpreul/master

Fixing failing test
Now supports the config not being an object