Fixed issues raised by Reviewer, This is the RC2 Release.