5.4 compatibility
Merge pull request #1 from jpauli/54_compatibility

5.4 compatibility