add 260
 update readme 260
Merge remote-tracking branch 'upstream/master'