File requests develop

PR #331 rebased to develop (take 2 because I messed up my branch for PR #335 and this was the easiest way to fix it!)