Pr/2

merged code