Merge pull request #1 from ChinosInternationalCC/master

merge upstream changes