Merge pull request #1 from MillerTheBeast/Working

Working