Javadocs
Clamp for long.
Merge remote-tracking branch 'origin/master'