vinos fix
Merge branch '0005-show-lines' into develop