Implementation for Issues #1, #2, #7, #8

Document Uploader issues addressed
Merge pull request #48 from gitcac/husain-wip

Implementation for Issues #1, #2, #7, #8