changing salutation
adding javadoc messages
Merge branch 'feature1'