Cmd line and output compatibility with go version.
Merge pull request #21 from tkalbitz/java-upstream-java-go-catchup2

Cmd line and output compatibility with go version.