add bugfix
Merge pull request #3 from Team-Combat-Wombat/feature/bugfix

add bugfix
Merged dev, selected Zach's version.