Merge pull request #1 from Tishka17/master

up this shit