Sublime text 3

Merged recent changes in master into ST3 branch