Search + tags
Merge pull request #16 from paf31/master

20130425