Feature/612

@iperdomo, please check.