Tweaks

Handle white space better with tags
Merge pull request #3 from codealchemy/minor-t

Tweaks