Issue #75

Fix so regexp works for custom tags