solve problem 12
merge master