Merge pull request #2 from duncandc/develop

Develop
working on TPCF