Code cleanup, adding new column for shortcode.
Adding version information, multiple shortcode support.