version to 0.0.2
Merge branch 'github/master'

Conflicts:
	package.json