Refine setup steps
Merge pull request #11 from hacking-thursday/bugfix/refine-setup-step

Refine setup steps