Javadoc comments translated to english
Javadoc comments translated to english
Merge development