Merge fork with master