Merge pull request #1 from Tes7/master

awesome! WTF I'm doing