added ./.. to DirEntry, updated cd
Merge remote-tracking branch 'origin/master'