Commiting last changes. Added the javadoc for @author, @version