Match on more tag types.
Update version to 0.2.2-SNAPSHOT