Merge pull request #1 from chr1x/preth00nker

Preth00nker
Update README.md
Merge pull request #2 from chr1x/preth00nker

Preth00nker
fixing conflicts
changelog