fix #211
fix whitespace
Merge branch 'master' into tim/fix-204

Conflicts:
	src/test/vmunit.conf