Merged latest master with pr/140.

Merged #140 into master (which contains #141).

@akitchen, you might like to review the merge. I resolved the obvious merge conflicts:
 - `+ (void)clearSpyInfoForObject:(id)object;` declaration in the headers
 - `self.originalObject` if-guard in the CDRSpyInfo's dealloc