Fix controller immediate hang-ups

I was not correctly including "Self" in method declarations
Merge pull request #1 from ufieeehw/fix_controller

Fix controller immediate hang-ups