Booyah fixes #36
Merge master and fix conflicts. Now #36 is fixed in Sublime Text 3 as well.