1.4 compat... but broke 1.5
1.5 compat
Merge branch 'master' of https://github.com/mtford90/silky