CFP gem updated to master