refactor ordini_demo
Merge origin/master