Merge pull request #17 from Gavin-AG/master

setOrder
order trace update