hash_tag support
Merge remote-tracking branch 'upstream/master'
rebase
Merge pull request #1 from cornelf/master

HASH_TAG support