Return empty string if message wasn't set, instead of undefined
add test
Merge branch 'pr/7' into pr7

Conflicts:
	test/tests.js