Fixed problems with contracts
Merge pull request #39 from tanvirt/Greg

Fixed problems with contracts