Merge https://github.com/andrescr92/Fungo

Signed-off-by: aivaco <aivaco@outlook.com>
Merge https://github.com/andrescr92/Fungo