Feature/test feature

merge this to develop pls