Allowing for config specification
Merge branch 'master' into bug/fix.regressions
Updated README with defaults
Updated code to match
Release 0.3.0