Controller->Machine
Merge pull request #4 from gamechanger/ps-initial

Controller->Machine