shortcodes improved with enclosing tag attribute and content for the heading

Signed-off-by: Davide Parisi <davideparisi@gmail.com>