Fix #113, Fix #112 improve duplicate file renaming
Merge branch 'master' of https://github.com/silverwind/droppy