Implemented new encoding format in java code
Improved doxygen comments