Added order function
Merge branch 'release/0.0.2'