fix classpath
merge with master