Find token contains cursor's point not range
Merge branch 'develop'

Conflicts:
	README.md
Prepare 0.2.0 release