Merge remote-tracking branch 'CJ/master'
Chen's order by.
Chens update
Merge pull request #6 from haywars/master

Chens updates