added files from cmd
Merge branch 'master-2'
merged code