Merge pull request #21 from Martimiz/search-20130107
Merge remote-tracking branch 'upstream/master' into rootpages