Merge branch 'develop'
Add file whitelisting option