Merge pull request #1 from slychika/master

Trial Run
Merge pull request #2 from slychika/master

fixing stuff
test

test
Merge pull request #1 from miwi0617/master

test