Merge pull request #40 from AEgan/egan-dev

RSVP updates
Merge branch 'master' into egan-dev
merging with master to send a pull request