configuration manager added
Merge remote-tracking branch 'origin/ckockan'