Merge pull request #10 from SouthShoreMedia/master

UPDATED: added short tags.