fixes #32
Merge branch 'master' into ComputerSystem