ST2 support (partial).
Merge pull request #2 from whitequark/master

ST2 support (partial)