Merge pull request #889 from b4n/c/return-type