Fixed media upload
Merged in upload (pull request #48)

Fixed media upload