Merge branch master, module version update