Fixed merging with master