Fixing file for merge with master