Merge pull request #514 from Maaack/update-code-of-conduct