Version increment; Added --preserve-original option