Merge pull request #6 from yusuftor/master

tdfd
further shizzlefonizzlemnizzle
Merge pull request #21 from TCollier92/master

ross is my bitch now