completely untested changes
Merge branch 'master' of github.com:encorelab/evoroom4