Merge branch 'development'

Mergin latest development features.
small improvements
Merge branch 'master' into development

Merging changes made on the master branch.