bug fixes
Merge pull request #41 from Studyokee/upload

bug fixes