Fixed #19
Fixed merge for exercise