Merge pull request #5 from myrle-krantz/develop

Progress on making sure events are sent the right number of times.