Add more tags, thanks to Jérôme
Merge pull request #13 from infosiftr/moar-tags-jpetazzo

Add more tags, thanks to Jérôme