Merge Develop into Master

Managed to get everything done and tested, seems to be working fine ^^