Added Configuration support
Changed README
Merge branch 'feature-configuration' into develop