Updated to work with Sublime 3