Merge from GitHub
classpath problem configuring solver fixed