Merge Issues with master