Fixed number ordering problem
Merge branch 'master' into feature/jocl