Merge branch 'master' into development

master corrupted
Fixed master branch