bug fix
Merge pull request #56 from teharrison/master

bug fix