Test more datatypes, correct handling of null.
Merge pull request #2 from timoxley/null-arg

Test more datatypes, correct handling of null.