Windows changes
Merge branch 'master' of github.com:kipr/computer