Merge pull request #207 from svost/void-return