updates from wm2
Merge branch 'master' of https://github.com/gnattar/universal
 updates from wm2  140425