minor edits to utils
Merge remote-tracking branch 'origin/v0.6.0' into v0.6.0
Merge remote-tracking branch 'origin/v0.6.0' into v0.6.0
Merge remote-tracking branch 'origin/v0.6.0' into v0.6.0

Conflicts:
	lib/assemble.js