Merging development branch for release