Merge pull request #99 from dalf/master

[enh] stick results from the same category and template and [fix] rewrite the google engine