[Bleeding] Allow spaces in tags. Resolves #160
Merge with master