0.6.5 support
Merge pull request #2 from dburles/patch-1

0.6.5 support