Removed the unnecesary import and performed some polish and commenting stuff.
Merge branch 'origin/ThreadingPerformance' it is ready to be packed into a jar file.