Add wang jun updates
Merge pull request #8 from hidroh/wangjun-a2

Add wang jun updates