Merge pull request #2 from BigKuCha/dev

Dev
Merge pull request #3 from BigKuCha/dev

22
test