added some feture
Merge branch 'master' into test
removed two files