better error handling
merge upstream conflict
add hashtag rendering
markup cleanup
Merge pull request #3 from folieadrien/refactor

Improvements