Merge pull request #84 from basho/1.4.x

Fix 5.3 incompatibility & improve test suite