Merge pull request #2 from psych0d0g/master

Several Updates to the source
Update feedcontroller.php
Update feedcontroller.php
Merge pull request #2 from Raydiation/master

Merge Upstream