Merge pull request #2 from donaldvossen/master

update upload module
Merge pull request #3 from davbritt/master

Merge pull request #2 from donaldvossen/master