Merge files
Bug fixes