Upgraded to support Sublime Text 3