Solved #40
Solved #43