Cleaning

Merging branches