Stylet tags
Merge branch 'master' of https://github.com/bratberg/Cibrary.git