Order selection fix
Merge pull request #10 from Axelena/master

Order selection fix