Added the improved JavaDoc created by Gian Merlino