Master multi cf support

Patches for #74 and #75 (have submitted the CLA)