added sublime support
Merge branch 'master' into amazon