Updated to work with the CMS
Merge pull request #1 from tccltd/production

Updated to work with the CMS