NULL returns and other such things
Merge pull request #9 from btparker/develop

NULL returns and other such things