+ Fixed compile errors.
Merge branch 'master' of ssh://github.com/austinwylie/Umm