cwei
Merge pull request #21 from cwei83/master

cwei done