Adding conferences, closing #19 and #20