Merge pull request #1 from ChinosInternationalCC/master

merge upstream changes
Merge pull request #3 from ovicin/master

Merge pull request #1 from ChinosInternationalCC/master