Update
Resolved conflicts in README.rst
Merge remote-tracking branch 'origin/master'