changes from desktop
Merge branch 'master' of https://github.com/greentheo/MOOTT