Initial setup of Machine
Merge origin/master