Committing before merging with L's new changes
Merge branch 'master' of https://github.com/guillen360/cfpicks