Merge pull request #1 from SlasherXT/master

Merge downstream
Merged
More merging
More merging
Merge pull request #2 from zeuslightning125/master

:P Let's hope this works. ;)