Updated to work with Sublime Text 3