Updated README to reflect latest merge