Revert "Update from original"
Merge pull request #2 from MadCat34/revert-1-master

Revert "Update from original"