Added support for more inline content
merged