Merge from develop
Some cleanup for Java version and sync seqware version