Feature/609

@iperdomo Please review this branch