Merge branch 'bug-79' into development
issue #84 and issue #80
file upload feature
Merge branch 'feature-80'