Changed order of tasks (issue #11)

Solved issue #11