merge erratas : code added