.
Merge remote-tracking branch 'upstream/master'
Merge pull request #23 from mershack/master

file upload works for the viewers