File requests develop

PR #331 rebased to develop