new changes
Merge branch 'master' into testing
removed extra files