Merge pull request #1690 from nulltoken/fix/warnings Fix Win32/64 compilation warnings & memory leak