Add archetypal events
Merge pull request #7 from rfreebern/master

Add archetypal events
Merge pull request #1 from dariusk/master

merge updates