Merge pull request #5 from zachoj10/master

Merging