changes
Merge branch 'master' of https://github.com/chenjyw/TransparentLA
changes
fixed conflict