inline tags, closes #32, fixes #20