Fixed bug in order class
Merge branch 'master' of https://github.com/resultares/esolutions