Merge pull request #12 from baranowb/master

Update to 6.3 and fix/revert xslt
FIxing javadoc
Preparing 1.2.0 release
Next development version