fix assignment bug
update readme
Merge remote-tracking branch 'upstream/master'