correct typo and add more set method again
Merge remote-tracking branch 'upstream/master'