bugfixes
Merge branch 'fix-code-segmentation'

Conflicts:
	lib/languages.coffee
	lib/utils.coffee