Merge pull request #1 from invisiblekid15/master

Update from original
Merge pull request #2 from skd1993/master

Merge pull request #1 from invisiblekid15/master