Merge pull request #107 from 5150Joker/dev

Some fixes directly from Altis Life Repo to keep our code updated.
Add UpdateUniform, Fix Market
Merge pull request #109 from buddytex/master

Add UpdateUniform, Fix Market