Machine construction fix

Fixes machine construction
Merge pull request #6 from HypatiaStation/master

Hypatia Pull 13/11/14
Merge pull request #226 from Askarn/HypatiaStation-master

Pull from Askarn