Update configuration
Merge remote-tracking branch 'mmcs/master'