Updated library to support hashtag