Implement file-watcher for configuration file
Merge branch 'file-watcher'
Merge branch 'master' into tests