Add file whitelisting option
Merge branch 'develop'