ST3 Support

From my testing this appears to work on both ST2 and ST3.

Addresses issue #15