Java Marshaller

Code enhanced and tested