Merge pull request #128 from shirlyLoveU/master

update index and esc close dialog