Fixed namespace bug.
Merge branch 'master' into search-refactor