Merge pull request #8 from biergaizi/upstream