Fixed clang warning about missing string.h include
Fixed clang warning about using 0 instead of NULL
Merge pull request #13 from seanm/develop

Develop branch - two minor warning fixes