Merge working branch with master