Corrections
Again corrections
Merge branch 'master' into New_feature