Fixed some bugs about when to include the shortcode css and js, made it to the v1.1