Fixes for ST3
Merge pull request #43 from duydao/master

Fixes for ST3