Add better typeof.
Merge pull request #1 from joneshf/master

Add better typeof.