Merge pull request #278 from shinh/contrib