merged the new classloader, updated documentation