added shortcodes
Updated version