Fix #83, rename on upload feature