Merge pull request #1 from TheMacLab/master

Fork update
Merge pull request #2 from TheMacLab/master

Update to fork
Merge pull request #3 from TheMacLab/master

Code refactoring
Store Shortcode Fix: inline shortcodes
Store Shortcode Notification Fix
Merge pull request #13 from foresthoffman/master

Store Shortcode Fix: inline shortcodes