[Issue #93][Finished] fixed the code and doc reviewers comments