Merge branch 'master' into dev
Updated packages and fixed what's broken
Merge pull request #2 from Ar3sDevelopment/dev

Merging master to dev