Merge upstream 1.0 version

Conflicts:
	CHANGES.txt
	README.rst
bump to 1.0 version