solved #34
solved #42