fix div by zero
[#375] add order expiration in advanced option
merge
Merge and fix changes