Implement Issue #1 
Signed-off-by:pdrolourenco@gmail.com <pdrolourenco@gmail.com>