Merging contribution of @InFog

Signed-off-by: willmendesneto <willmendesneto@gmail.com>