migrate pr #36 from fbrusatti repo

:scream: