Merge pull request #1 from flexage/master

update
Fix for WMC not displaying content
Merge pull request #2 from snazy2000/master

Fix for WMC from Snazy2000