merge merge merge

adding my changes, there should be a way to do this without me sending you a pull request every time?