Merge pull request #10 from gunyarakun/fix-invalid-return