more 5.4+ compatibility
Merge pull request #27 from cotal/master

more 5.4+ compatibility