Merge pull request #1 from Axelena/order_selection

Order selection