Remove a warning showing on OSX
Fix a couple of uninitialized variables showing on OSX (LLVM you rock!)
Merge pull request #1 from ctrix/master

auto merge