Small changes to classpath of project
Merge remote-tracking branch 'origin/master'