Merge pull request #171 from thess/contrib-update