tweaks
Merge pull request #6 from andypiper/cf

tweaks