Fixed cf3 block issue
Merge pull request #263 from TekHus/master

Fixed cf3 block issue
Merge pull request #761 from KevWright/master

Fixed cf3 block issue