Added support for Master Config. Thanks Mike.