Release Canditate 2 - Minor code cleanup & JavaDoc updates.