Merge pull request #103 from galstrom21/master

bug fix