Hopefully fixes #30
Merge branch 'master' into ComputerSystem