New constructor.
Minor changes.
Remove Java-version