Merged Master into Flammy via Githubg GUI

Merged Master into Flammy via Githubg GUI