Fixing further SS 3.1 compatibility issues
Merge pull request #11 from halkyon/further_31_fixes

Fixing further SS 3.1 compatibility issues