Add Users and Machines
Merge branch 'release/v0.0.1'