Final commit.
Merge pull request #11 from shuyangli/iheanyi-dev

Final commit.