7.8 Fixes
Merge pull request #3 from sheganinans/master

7.8 Fixes