Fixed a bug when current directory doesn't extist
Merge branch 'temp1'