Added Features

Added support for shortcode.