revert back to 0.1.2 because the 0.2.0 tag wasn't with the appropriate version number
Merge remote-tracking branch 'origin/master' into smallfix

Conflicts:
	package.json