Merge pull request #1 from ariesbrunetyson/master

Update from original