Merge pull request from ARGaming/master

sync updates