Updated functions (see Readme) and shortcodes

Signed-off-by: Simon Vandereecken <simon@nithou.net>