Merge pull request #1 from thomasleyer/master

Conferences