Added context example
Using 32 character random string to determine other type when merging contexts
Annotations can be prefixed with a space
Reving to 0.10.4