Making simple things even simpler
Fixed multiline problem
Merge branch 'devel' into callbacks-merge

Conflicts:
	bridge.js
Merge branch 'callbacks-merge' into devel