Working on Desktop issues
Merge branch 'master' of https://github.com/xtingray/tupi.mobile