Merge pull request #2 from Hube2/master

Refresh from Master
added comment about not adding shortcode filter to widget function more than once
Merge pull request #3 from Hube2/Dev

Pull from Dev