Change package name to fit Sonatype naming convention
Merge remote-tracking branch 'origin/master'