Fix function call and variable screw up
Merge pull request #32 from evilpie/fix-switchup

Fix function call and variable screw up