Some fixes directly from Altis Life Repo to keep our code updated and bug free.
Merge pull request #107 from 5150Joker/dev

Some fixes directly from Altis Life Repo to keep our code updated.