Merge dasistwas to atlet

Merge actual version from dasistwas to the one of atlet