Corrected implemenetation error in marry.
Merge branch 'master' of https://github.com/kiniry/objective-c