a bug fix to v1 that will be merged to v2
Merge branch 'master' of https://github.com/robhowells01/cml-demo into version2branch

merge master bug fix into the version 2 branch