merge

DEV-2 updated content

hello adding new commits 1 and 2 - by jojotjo