Add annotations for basic types.
More annotations for basic types.
Merge pull request #32 from mdickinson/annotate-basic

Annotate basic types