Improved order generation
Merge branch 'master' of https://github.com/g1253009/rest_ops