Add documentation
Fix Bug on method