Order canceling fix
Merge branch 'master' of https://github.com/Pestret/pv243-project