Merge pull request #1 from MrArcane111/master

Important info added: PLEASE READ!
Merge pull request #2 from MrArcane111/nightly

Merge pull request #1 from MrArcane111/master