Merge pull request #884 from oliverds/master

Several bug fixes
closes #881
closes #874
closes #873
closes #879
closes #871
closes #885
closes #885 error uploading files