more compatibility
Merge pull request #49 from sbillard/master

more compatibility