beta.7 support

[tomjtoth]

I'm not familiar with pull requests/issues/working with git, but I updated your class as I needed it at work, feel free to merge whatever you need from it