Merge pull request #157 from zengyue/uploader

Uploader