fix open bug + renaming when save as
Merge remote-tracking branch 'origin/master'