Merge pull request #1 from RadioFreeAsia/master

fork update from upstream
Merge pull request #3 from flipmcf/master

Merge pull request #1 from RadioFreeAsia/master