Let's test on 5.5 too
Merge pull request #42 from asm89/patch-1

Let's test on 5.5 too