Support > 0.9 properly
Merge pull request #3 from flanamacca/master

Support > 0.9 properly