1
Merge branch 'feature_new' into 1.0.x

Conflicts:
	README.md