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

Misc Bug Fixes