Add wrapper option
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/cpappas/Twig/Extension/MarkdownExtension.php