Feature/feature two

did a rebase from the develop branch.