change class loader to static methods.
Merge branch 'loader'