Merge pull request #10 from SouthShoreMedia/master

UPDATED: added short tags.
Merge pull request #1 from joomlachicagoloop/master

Merge pull request #10 from SouthShoreMedia/master