Feature/en 1831

Same comments as before for this bin directory.