finished feature

Signed-off-by: Raphael J. Lopes <raphaeljlps@gmail.com>