New base setting.
Merge branch 'pr/14'

Conflicts:
	SublimeServer.py