Merge branch 'master' of github.com:MindlapseDemos/wip-dosdemo