Support non-standard tags
Fixes #61