Don't assign NULL to int, Clang complains
Merge pull request #2 from crumblingstatue/master

Don't assign NULL to int, Clang complains