Inital fix for issue 109 via using -D on JVM