b1318
Merge branch 'master' of https://github.com/pnecas/sudiyiTerminal

b1338