@mok89
	fixed some bug
@mok89
	fixed some bug
Merge branch 'master' of https://github.com/mok89/UEM.git