Changed how jars are loaded. Load with classpath now
Merge remote-tracking branch 'origin/master'