Remover order class
Merge branch 'master' of https://github.com/gabberr/SCM-calculation