Merge remote-tracking branch 'origin/issue-2-support-underscorejs' into issue-2-support-underscorejs

Conflicts:
	package.json
Merge remote-tracking branch 'origin/issue-2-support-underscorejs' into issue-2-support-underscorejs