Shortcode bug corrected
Merge branch 'master' of https://github.com/fabioquarantini/ground