detail ÓŻ¯
merge master