Update order
Merge pull request #15 from svalinn/initial_setup

Update order