Merge pull request #8 from Eric-Guo/master