Merge pull request #2 from Shkryob/master
for test branch
upd
upd
upd
Merge pull request #1 from through-a-haze/master

Merging