Final product
Merge pull request #4 from shiyingzheng/master

Final product