Ethan Heilman Merge pull request #8 from kiaraRobles/master