Fix some return values.
Merge pull request #143 from phazei/fix-comments

Fix some return values.