Update computer software
Merge branch 'computerupdate'