Merge pull request #2 from kellyelton/test

Catching up with KellyElton Base
Fixed the aesthetic fix
Merge pull request #1178 from DarkSir23/test

Fixed the Aesthetic Fix