Merge in latest Master from GregGilbert origin to OzzyOGKush Repo

Fetching from forked repo's base upstream.