Make in correct order
Merge branch 'cherijni' of github.com:davidbrazdil/cherivm into cherijni