Merge branch master, module version update
Update version