Fixed some bugs.
Merge branch 'master' of git@github.com:gigablast/open-source-search-engine