Merge pull request #224 from shirlyLoveU/master

fix dialog
update
update
Merge pull request #37 from RubyLouvre/master

fix pager bug