Merge pull request #1 from Phell0x/master

kl
Merge pull request #2 from jaxcxe4/master

Merge pull request #1 from Phell0x/master