Hopefully adding these changes to my branch and not master.
Merge pull request #1 from eklundjoshua/CRJosh

Hopefully adding these changes to my branch and not master.