Fixed hash-tags

Closes #337