fixed Nulldivision Warning
Merge branch 'addorder'