Radovan's memleak patch
Merging Robert's changes
+ Merging cmh changes