Fix setup.py
Merge branch 'feature/titled-markup' into staging