Feature/main features

First merge with develop