#17 diversos
from branch issue-17