Fixing issue #2
Fix bug for old machines that haven't checked in.
Merge pull request #1 from grahamgilbert/master

Merge of master