Remove unused and inconsistent return values
Merge pull request #176 from JeroenDeDauw/retval

Remove unused and inconsistent return values
Merge remote-tracking branch 'github-origin/master' into customfix