Updating fork to latest master branch from GG