Made final merging with master