close #35 (solved remote part)