Ticket #1: configuration stuff added