GitHub #24 - Test on 5.5