Fix possible bugs.
Merge branch 'master' of git@github.com:oveis/Web_Search_Engine.git