Merge branches 'development' and 'master'
small fixes
Merge branches 'master' and 'development' into development