Some amendments towards Sublime.
Merge branch 'master' into sublime