Add more changes from wangjun
Merge pull request #10 from hidroh/wangjun-a2

Add more changes from wangjun