Added @mentions and #hashtag detection