incorporating changes from PR 300 to cf-docs repo