update
it works
Merge pull request #2 from chchiou/master

Let's merge!
Merge pull request #3 from chchiou/Yilin

Apply Yilin/src to Master/src