Merge branch 'master' into delete-test
minor errors
Merge branch 'master' into delete-test
removed a file