Issue #110 - Adding config