Bug fixes added the ability to over ride sothe shortcode