Merge pull request #18 from aliciafrench/master

added events - not displayed yet