Take advantage of markup

Signed-off-by: Lehner Florian <dev@der-flo.net>
Merge pull request #3 from florianl/markup

Take advantage of markup