Fix classpath for master branch
Merge remote-tracking branch 'whatsToDo/master'