Fixed (?) bug where multiple jars loaded incorrectly
Merge remote-tracking branch 'origin/master'