Merge pull request #1 from vyazadji2/master

changes in fork
some changes for conflict
add new file
2: some changes for conflict
merege pull request #2