resolves #226 support including tagged lines