Changes recommend by keith added
Merge branch 'master' of https://github.com/developer-foundry/cohortone