Merge pull request #738 from danak6jq/new-classpath2