Added origin to types. The original sin, basically.
Merge pull request #363 from plesner/origin

Added origin to types. The original sin, basically.