bug fixes
Merge pull request #9 from leighmartell/gordienoye/bugfix

bug fixes