Doc updated
Bug fixed