Making new attempt to add files
Merge branch 'master' into Kevins