Update Documentation and bug fix
Update Documentation and bug fix