Fixed Issue #221

Fixes #221
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
Merge pull request #227 from Lorwp/Space-law-fix

Fixed Issue #221
Merge pull request #4 from HypatiaStation/master

repository update