Merging branches to make easier the development