6.0 beta support
Merge pull request #2 from neonichu/patch-1

6.0 beta support