1.6 compatible
Merge pull request #8 from bishless/onepointfivecompat

1.6 compatible