Update readme and merge PR #3