Merge pull request #12 from isturdy/master

7.6.2 compatibility.