Merge pull request #3 from trekkie4life/master

event