Merge pull request #20 from galstrom21/master

debugging