Merge pull request #41 from tanmaykm/tanmaykm

fixes #38. large file uploads
Merge pull request #43 from tanmaykm/tanmaykm

Multiple changes/fixes