Merge branch 'master' into HEAD
fixed the issues with extra stuff