Added a bug fix.
Merged dev, selected Zach's version.
Merge pull request #4 from Team-Combat-Wombat/bugfix

Added a bug fix.