Shortcode tweak + readme #2570