Merge and change of pull #6