Started merging some changes from branch master
Merge branch 'core-refactor' of github.com:webdetails/cpf into core-refactor