Merging new development version