before merge
Merge remote-tracking branch 'upstream/master'
RLS
Merge pull request #5 from GuoSongtao/master

RLS