fix package and repo name
Merge branch 'master'