ok addMachine, you need some sanity
Merge pull request #64 from yetanotherhacker/makeitsane

ok addMachine, you need some sanity