Wrap up everything
Merge pull request #5 from zfei/master

Wrap up everything