Merge pull request #199 from ruijunhuang2010/master

revert back to the state before page breakage