Merge pull request #3 from dgw/master

Proper compatibility for 2.6 and 2.7