Merge pull request #1 from Axelena/order_selection

Order selection
Merge pull request #7 from Axelena/master

Merge pull request #1 from Axelena/order_selection