Use properties dict for factory configuration.
Rewrote configuration loading.
Merge branch 'config'