Works with 0.6.5
Merge pull request #17 from tmeasday/0.6.5

Works with 0.6.5