merge dev branch

as agred