Port to ST3.
Merge pull request #18 from xpol/master

Port to ST3.