rebased on mario
processed
fixed autocompletion
updated version