Merge pull request #90 from pioardi/contributor-list