Solved #50
Solved #62