Merge pull request #4 from lcw/fixes

Added fixes from Lucas
Add c header required for `uintptr_t`