update order parser
Fix a bug in orders parser
Merge branch 'naryl' into dev