Adds functionality and test for overriding original file name
Merge branch 'development' of github.com:afred/openvault into development