Revert "Updated for current CF"
Merge pull request #4 from andypiper/revert-2-master

Revert "Updated for current CF"