Made availible for ST3
Merge pull request #1683 from martinssipenko/master

Made availible for ST3