Switched version to 0.3.0-SNAPSHOT on master
Merge branch 'release-0.2.x'

Conflicts:
	package.json
Performance tuning
Reverted version back to 0.2.12