changes for promoting to Maven Central - rjrjr