Fix all machines.
Merge pull request #18 from micdoodle8/master

Fix all machines.