Will take as-is and expand the testing a bit before the next release then.

I'm also still intending to include the button enhancements before the next major release