Adds more tag support. Fixes #61