Merge pull request #1 from zyax86/master3

Master3
add files
Merge branch 'master2' into master3