progress commit
Merge branch 'master' into stephen

Conflicts:
	lib/router.js
Merge pull request #24 from jsajnani79/stephen

progress commit