Valama: Improved text tags
Merge branch 'master' of https://github.com/Valama/valama