Merge branch 'hotfix/0.6.2'
changed version
Merge branch 'develop'

Conflicts:
	package.json
Merge branch 'release/0.6.4'
Update README
Merge pull request #2 from mion/patch-1

Update README
README update
0.7.0
fixing branch merge