Merge pull request #21 from lab41user/master

Misc Bug Fixes
Merge pull request #22 from lab41user/master

Cleaned up some debugging print statements
Report generation bug fix