configuring stuff
Merge branch 'Jerzy_work'
whatever 14.05