Merge pull request #512 from github/lcartey/contracts

Merge pull request #512 from github/lcartey/contracts #2683