Merge pull request #41 from kevinyby/develop

Contract
develop