fix #63
fixed #62
Merge branch 'master' of https://github.com/sebriois/Order-Manager