Merge pull request #22 from khawkins/unstable

Package: merging master into unstable
2.0.2 updates
Merge pull request #23 from khawkins/202_update

2.0.2 updates
Merge remote-tracking branch 'upstream/master' into unstable

Conflicts:
	Dependencies
	package.json