Merge pull request #5 from ellbristow/master

Another attempt to re-apply 1.4.6
== 1.8.4 ==
Fixed: 1.4.7 compatibility