Fixing Shizz
Merge pull request #40 from berjoyner/BerBranch

Fixing Shizz