Bug fix: return call was causing a short-circuit
Merge pull request #74 from johnnyshields/master

Another bug-fix for my recent code