Merged README.rst from development