bug fix
Merge pull request #16 from teharrison/master

bug fix