Merge pull request #36 from Mr-Runtime/master

My First Legit Pull Request that I'm Proud Of