Update package name
Merge with master