Merge basic and two-factor setup
Merge pull request #153 from telemachus/setup

Merge basic and two-factor setup