Sixth round of contracts for non-Void-safe users
Merge pull request #44 from colin-adams/master

Contracts for non-Void-safe users (take 5)