Merge pull request #22 from galstrom21/master

more debugging