added missing return statements
Merge pull request #273 from gharlan/patch-2

added missing return statements