Solving Moka-153
Including files from paola's branch