using new put method, javadoc fixes
Merge remote-tracking branch 'origin/master'