merged: imoseyon fixes and features

thanks to @imoseyon

Signed-off-by: Humberto Borba <humberos@gmail.com>