cherry-picked classpath entry
added preliminary command line option
merged master