Test commit for branch wojtek
fixing merge