Updated readme to v1.0.2
Merge branch 'master' into scala-2.11

Conflicts:
	README.md