Change for 2.10.x compatibility
Merge pull request #8 from cunei/master

Change for 2.10.x compatibility