Update master to latest-version from my own repo