Use local class loader for better behaviour outside JDK
Remove TODO
Prepare for v0.7.1