Implemented order
Merge pull request #110 from Gerrrr/feature/order

Implemented order