add missing std includes
s/NULL/0/ in non-pointer context
Merge pull request #2 from ebfe/fix-warnings

Fix warnings