fix classpath
Merge branch 'master' into soln