Merge branch 'staging'
Merge branch 'master' into staging
add missing machine states
Merge pull request #333 from mistio/add_machine_states

Add machine states