update README to reflect the merge of #317