Minor changes from lm-1
Merge branch 'master' of https://github.com/gnattar/universal