Merging development branch