Version 3 support

Hopefully this addresses your issues.

Honestly, I am a bit gobsmacked at your attitude to my pull request that I did to help the community.  The changes here could have easily been incorporated by you instead of your attitude.  I welcome contributors to my open source projects and help them, instead of criticising.