Changes made by Jeff.
Merge pull request #1 from BrennanJones/master

Changes made by Jeff.