more logical logic
Merge origin/unwrap into unwrap

Conflicts:
	collection2.js
more logical logic