Merge pull request #385 from hynek/better-contributions

Better contributions