Version bump
Minor code cleanup
New shortcode generator