Merge branch 'release/v1.5'
proper fix for #15 - need to revert attribute to original value if no upload or error
Merge branch 'hotfix/empty-handling' into develop